Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 00:01:45 +0000 (17:01 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 1 Jul 2011 00:01:45 +0000 (17:01 -0700)
commit9489390f05c26adecfeca89874d34ee0591a1dc9
tree6c539afd126f699777a93dfb4bd520353d411637
parent9fd4ae38d23c4021d3517919bbc4b4afbdf169c8
parent902f9ad5a025ce16d9b4667f64e33e982f37a9fc
Merge from trunk.